From 6be575992f8e5b30dc8b8f2794e6a02941dc0031 Mon Sep 17 00:00:00 2001
From: Jakub Steiner <jimmac@gmail.com>
Date: Fri, 20 Nov 2020 11:26:13 +0100
Subject: [PATCH] Adwaita: unified sidebar styles

- stacksidebar focus, separation and color as everything else
- eliminate placessidebar double padding

Fixes https://gitlab.gnome.org/GNOME/gtk/-/issues/3382
---
 gtk/theme/Adwaita/_common.scss | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 09b43d09df..2b71335c95 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -3562,6 +3562,10 @@ filechooserbutton:drop(active) {
 }
 
 stacksidebar {
+  //not a regular list
+  list.separators:not(.horizontal) > row:not(.separator) {
+    border-bottom: none;
+  }
   row {
     padding: 10px 4px;
 
@@ -3572,8 +3576,20 @@ stacksidebar {
 
     &.needs-attention > label {
       @extend %needs_attention;
-
-      background-size: 6px 6px, 0 0;
+       background-size: 6px 6px, 0 0;
+    }
+    &:selected {
+      background-color: $menu_selected_color;
+      border-radius: $menu_radius;
+      color: $fg_color;
+    }
+    &:selected:hover:dir(ltr), &:selected:hover:dir(rtl) {
+      background-color: darken($menu_selected_color,5%);
+    }
+    &:focus:focus-visible {
+      outline-width: 0;
+      background-color: $selected_bg_color;
+      color: $selected_fg_color;
     }
   }
 }
@@ -3648,6 +3664,7 @@ row image.sidebar-icon { opacity: $_placesidebar_icons_opacity; } // dim the sid
 */
 
 placessidebar {
+  &.sidebar { padding: 0; } //override default as it's nested
   row:not(:last-child) { //FIXME: specificty bump hack
     padding: 0;
 
-- 
2.30.2